auto merge of #297 : alexcrichton/cargo/url, r=wycats
authorbors <bors@rust-lang.org>
Wed, 30 Jul 2014 19:59:30 +0000 (19:59 +0000)
committerbors <bors@rust-lang.org>
Wed, 30 Jul 2014 19:59:30 +0000 (19:59 +0000)
The standard url library is soon-to-be deprecated, and now that we're
bootstrapping it's trivial to move over to rust-url.

Closes #204


Trivial merge